No popup menu on the button

diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index bf5edf654dbd446effcf033fbe287ab3350edf7a..4211f60a97d6071a98c0f11975788bc2cc450f34 100644 (file)
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -451,7 +451,8 @@ swatch_button_press (GtkWidget      *widget,
 
   gtk_widget_grab_focus (GTK_WIDGET (swatch));
 
-  if (gdk_event_triggers_context_menu ((GdkEvent *) event))
+  if (gdk_event_triggers_context_menu ((GdkEvent *) event) &&
+      swatch->priv->has_color)
     {
       do_popup (widget, event);
       return TRUE;